From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 22 Jan 2021 18:29:07 +0000 (+0100)
Subject: extensions-app: Support building a separate Devel app
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~393
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=60d640189b5eb1d5aced745dec469a38b5542b12;p=gnome-shell.git

extensions-app: Support building a separate Devel app

Follow the pattern used by most GNOME applications and add a profile
build option that allows building a Devel app instead of the regular
release.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3612

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1661>
---

diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
index e7bfa9965..d7e7d4001 100644
--- a/subprojects/extensions-app/data/meson.build
+++ b/subprojects/extensions-app/data/meson.build
@@ -1,6 +1,6 @@
 gnome.compile_resources(
   app_id + '.data',
-  app_id + '.data.gresource.xml',
+  base_id + '.data.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir
@@ -16,7 +16,7 @@ desktopconf.set('prgname', prgname)
 
 i18n.merge_file('desktop',
   input: configure_file(
-    input: desktop_file + '.in.in',
+    input: base_id + '.desktop.in.in',
     output: desktop_file + '.in',
     configuration: desktopconf
   ),
@@ -36,7 +36,7 @@ if (desktop_file_validate.found())
 endif
 
 configure_file(
-  input: app_id + '.service.in',
+  input: base_id + '.service.in',
   output: app_id + '.service',
   configuration: desktopconf,
   install_dir: servicedir,
diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
index dcdb03bd6..4406a3e5b 100644
--- a/subprojects/extensions-app/data/metainfo/meson.build
+++ b/subprojects/extensions-app/data/metainfo/meson.build
@@ -1,6 +1,6 @@
 metainfo = app_id + '.metainfo.xml'
 i18n.merge_file(metainfo,
-  input: metainfo + '.in',
+  input: base_id + '.metainfo.xml.in',
   output: metainfo,
   po_dir: po_dir,
   install: true,
diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
index a378a7e34..3b5415921 100644
--- a/subprojects/extensions-app/js/meson.build
+++ b/subprojects/extensions-app/js/meson.build
@@ -16,7 +16,7 @@ configure_file(
 )
 
 configure_file(
-  input: app_id + '.in',
+  input: base_id + '.in',
   output: app_id,
   configuration: launcherconf,
   install_dir: pkgdatadir,
@@ -24,7 +24,11 @@ configure_file(
 
 gnome.compile_resources(
   app_id + '.src',
-  app_id + '.src.gresource.xml',
+  configure_file(
+    input: base_id + '.src.gresource.xml.in',
+    output: app_id + '.src.gresource.xml',
+    configuration: {'profile': '/'.join(profile.split('.')) },
+  ),
   source_dir: ['.', '../../../js'],
   gresource_bundle: true,
   install: true,
diff --git a/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml b/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml
deleted file mode 100644
index 8cda0f91a..000000000
--- a/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/Extensions/js">
-    <file>main.js</file>
-
-    <file>misc/config.js</file>
-    <file>misc/extensionUtils.js</file>
-  </gresource>
-</gresources>
diff --git a/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml.in b/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml.in
new file mode 100644
index 000000000..330ede100
--- /dev/null
+++ b/subprojects/extensions-app/js/org.gnome.Extensions.src.gresource.xml.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Extensions@profile@/js">
+    <file>main.js</file>
+
+    <file>misc/config.js</file>
+    <file>misc/extensionUtils.js</file>
+  </gresource>
+</gresources>
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 7a21acc7d..c68dfb1b1 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -4,7 +4,14 @@ project('gnome-extensions-app',
   license: 'GPLv2+'
 )
 
-app_id = 'org.gnome.Extensions'
+if get_option('profile') == 'development'
+  profile = '.Devel'
+else
+  profile = ''
+endif
+
+base_id = 'org.gnome.Extensions'
+app_id = base_id + profile
 prgname = 'gnome-extensions-app'
 
 gnome = import('gnome')
diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt
index 435f237e6..ca2eb4115 100644
--- a/subprojects/extensions-app/meson_options.txt
+++ b/subprojects/extensions-app/meson_options.txt
@@ -2,3 +2,11 @@ option('package_name',
   type: 'string',
   description: 'The gettext domain name',
 )
+option('profile',
+  type: 'combo',
+  choices: [
+    'default',
+    'development'
+  ],
+  value: 'default'
+)